Cleanup
Adjust number of sample sets, lens parameters