#533 - Formatting to clear checkstyle warnings