Trailing spaces, re-Tab, removing unnecessary comments