corrections, refact