Removed redundant code
Removed trailing whitespace