+ Continued to refactor