Small restructure and comments!