Clean-up and format; use diamond operator