Fixed whitespace and commenting issues
Removed old comments that will be replaced with new and correct comments