update q2 to use STDIN
update short_code for q1 to use STDIN