Tidy up code a bit
Update to version 0.0.7