Some clean up.

- add const and reference (that removes some copies :-) ).
- remove useless include.