Code refactorization (indev)