less typing, minor style tweaks