Minor changes

* headers in alphabetical order
* removed non-const getter
* removed unnecessary auxiliary variable
* removed unnecessary foundation:: namespace