* Minor code refactoring