Small refactoring
More refactoring
Small refactoring to simplify.