A little more code cleaning and file organization