[WIP] Clean catalog models

@fitn to follow SF standards (comes from hack)