Comment cleanup
Cleanup
Removed header
Added normalize