Fix camelize bug. Test and code cleanup.