Remove commented code
Comment spacing