Added cleaners and reformatted classes