Cleaning up the prototype