Add minor refactoring