Set version to 0.6.2-SNAPSHOT + minor clean up