slight code refactoring
slight code refactoring
resolve