Upcase the input for testing against the correct answer. Misc cleanup