clean up

 * removed dupes
 * removed commented out code
 * removed useless function
 * grouped settings/commands
 * added comments / full name of commands for clarity