more refactoring prior to release