more housekeeping / code tidying
refactoring