refact catalog part 2