cleaning up prototype