Improved style in catalog subpackage.