test tidy up
refactoring