Refactoring, cleaning ...