Continuing with the refactor