Code refact