continued refactoring of design artefacts