stylistic refactorings
w/ less syntactic sugar