A slightly cleaner mess