Style/coding improvements

* Swap in variables
* Fix operator alignment
* Round corners