Remove commented out code
Wrap a bit better
Sort and remove duplication in main()