Small refactor (a bit stylistic)