Made some adjustments recommended by @drak and @bobthecow.