Cleaning up style + adding trailing closures.