Nice, this makes it cleaner, too