Some minor code polishing:

- const as const can
- use C++11'ism where possible