Fixed naming convention, added more comments