More copyright notices / More comments / Using object and string instead of Object and String / Cleaning up using sections