Oops! Forgot to add this to refactoring commit a little while ago.
Tweaked main just a tad.