Minor changes according to @ediosyncratic's review.