Remove some code that had been commented out. Spacing tweaks.