More refactoring

See #167
Cleaning