minor improvements
Todo
const correctness