Spacing cleanup. Remove commented code.