Made code -Wshadow clean, missed a bunch of issues in the last commit