Cleaning structure
refactoring + omnibus