continuing with the refactoring project