Refactored. Code pattern epiphany happened.