Remove commented code
Remove trailing spaces