Fix -WShadow definition warning
Cleanup some leftover