Removed a couple of 'const' and '&'