Continuing with refactor