moar cleaning of code!