Commenting and changing function names to camelCase