Comments
Replaced redundant code.