Moar cleanup and changes