Fixed styling

Issues with relation to style guide camel-casing vs under-scoring, and
re-using variable names inappropriately.