Code formatting fixed
Removed redundant code.