version bumped to 0.6.0-SNAPSHOT
code cleanup