Created constant for choice yes, separated out repetitive code into functions
Modified variable naming, constant regex for time,removed splat argument