Formatting

Also changed a parameterization in the Catalog class