Code refactorization started