Clarify variable names
Correct output headers