Lots of reformatting to remove unnecessary `()` and space expressions out.