slight prettifying refactor