neatened v0.2 code

minor formatting changes