* Minor source code refactoring