some code cleaning and moving stuff