Misc. cleanup
v1.0.4