clean up and finish code layout in PrivAnalysis