General code clean up to a somewhat acceptable state. Fix issue with if statement and not jumping over the if block if an else statement was not provided. Print a newline after ever call to print