Cleaner, final version of 2.0