v2.16

Minor code updates for better var names/more readable style. Cleaned
up some extraneous lines.