Brief refactoring. Need to finish camel casing and function creation