Small refactorage