Slimmed down code