Moved listing of categories to include, refactored them to trim whitespaces