- Fix typos
- Remove duplicate variables
- Remove nop variables
- Sort categories

Reported by:	portscan