Slimmed it up a bit