more refactoring

Pull at your discretion ...