Sort:  

It's pretty messy indeed, if it keeps hurting the project it's time to change it up in my opinion