Tidy up code
Bump version to 0.3.1