* minor code refactoring