Cleanup whitespace, add comments