Completing refactor