Slight cleanup of variable names. Snake case preferred in Ruby.