Labelled crates and tidied code
Merge pull request #5 from lisanmorrison/master

Labelled crates and tidied code