Nice, but could have been cleaner