Nit: There are still a lot of places without spaces before and after '+'.