DEV: interim refactor