A little bit cleaner...