Removed unnessesary case checking
Removed unnessesary comments and changed naming issue