re-Refactor

couple failed to commit