Addresses minor style issues