Minor changes for extraneous duplicate line, and constness