I'll take a look and see if that makes it cleaner