Cleanup of commented code, fixed typo