Cleanup

Cleanup semicolons, whitespace and mutable default arguments