some refactoring, no change in performance seen