-Trivial refactor