#168 minor refactor
#168 minor refactor