Code refectoring..