Refactored function names to be cammelCase