Small refactor

Cleaner.