Minimal code formatting, cleanup and patient_summary_view preparation