Some refactoring + files cleaning