Modifications per @charmander's review comments.