Sarang | Code refactoring