cleanup and formatting
v0.1.1