lint stuff
move and remove extra stuff