Uncommented cleanup code
Minor tweaks
Removed copy-paste fail.