Clean up from @FahimF 's code.

I'd prefer spaces rather than a tab, long-but-intuitive variable names
rather than abbreviations.