Tidied up documentation and code
reminify
Merge branch 'tidy-up'