Cleaning up Jake's code.