Added some comments and general hygiene