cleanup and add let statement to p3