Tidying up example applications