Code clean up, switching to camelCase