Removed few commented code and line wrappings