Some minor code refactoring