Style changes to match @lloydbenson's suggestions