Tidy up and confirm version 0.6