STYLE: Remove compiler warnings

unnecessary const on return warning
shadow variable warning