Block label hyphen formatting added to label-after-arg; function split up
Secret-number blocks adjusted