Refactoring

@david-daal