Refactoring

Watch the refactoring going on ...