Moar code cleanup!