Cleanup whitespace, commas (#33)