user_steps cleaning
tiny changes
moar cleanup