Minor
minor refactoring