Continue refactor last commit