cleaning and moving stuff for more coherent methods and classes