Cleanup whitespace, syntax