Code refactor continue