Code clean up and implementation of brochure types