style refactors from previous commit