Merge "Miscellaneous coding style and output improvements"