Continue Cleanup of refactor