Fixing, cleaning, refactoring...