yep, would be cleaner.