Removed some comments

Made the code more readable
Compact code