Refactored here: 9155294

WDYT?