Remove commented out entries.
Simplify look of entries.