Improved documentation
Tidy-ups