Continue refactor code