Clean up extra spaces in code, fix invalid entry selection from exiting program