Improve readability of organization sql construction