After code refactor