Improved readability via std SQL coding style