small fixes

style fixes mostly, and (whoops) renaming a method