Refactoring thanks to tsloughter