Seems simple enough, but I don't see any viable improvements