Minor refactors

minor refactor