Split more less file, and remove useless property. I like when my files are clean.