Tidy up Sample App a tad.