Shorter names and minor style improvements