cleaning up code for presentation