Remove "DRY" from Shota's code