Rename variable, add commented debug statements