Even moar code cleanup