completes initial refactor