slight refactoring
removing artefacts and fixing docs