camelCasing and further improvements to stick within 80 char line limit where possible