Formatting fixes, removed unused code

Fixed some commenting, extra lines, removed commented code.