Refactoring
to make sure