More categorization improvements and fix whitespace