Tidying working prototype