add EOL's and remove commented code