More small fixes

* Style
* Const correctness