Style adjustments and renames
Fix bug in Overall Performance Analysis where Surplus was wrong