Remove commented out code block
More consistent var names.