various pedantic design tweaks