Small fix and refactor