Some minor style improvements