Revert "cleanup semicolons, whitespace and mutable default arguments"

This reverts commit 7265682a4d57d88956cb54f98f7a470465bbf417.