Switched inc/dec keys in config, removed redundancies from main