Cleaning

Light code cleaning, moved some stuff around.