Few source code refactoring