looking for places to refactor