Const added where possible #1