make it all a bit cleaner