JSQLW-18 Source Formatting