Refactorings

@sollecitom