Started to cleanup whitespace