Final cleanup of refactor