Some refactoring

blabla