Cleanup

Cleaned up some duplicate code.

Also, the problem with the screen not showing all the info when entering 2 letters or blank answers lies in the "next" that skips the loop before the picture is drawn to the screen :+1: