Cleanup of code - strtolower was removed for support of CamelCased database column names