Is it *that* hard to tidy up a little bit?