Minor formatting changes and update comments.
Bump version to 0.6.0