Update to use print shortest

Some whitespace fixes for good measure