More consistent code-formatting

Added some code to ensure the code is quantified correctly.  Also added some test data - one for each of the languages we will support, so we can test the formatting.