Code refractoring and comenting