4,3 code refact