Improved formula + CamelCase correction