Fixed consistancy in naming
Added comments, fixed method names & protection