Final submission

Tidied code a smidge -