Code cleanup

Try giving more descriptive variable names.