Tidying up prototype