Code refractoring - visual changes