Resolves refactor issues