Switch to camelCase and continue implementing some utility functions