fixed spelling mistake
removed useless comments and changed the class type
converted more strings to constants