nit for future tickets; don't mix style changes with code changes; it makes it harder to figure out what parts of the diff are functional vs style