Adding documentation
Tidy up