Source layout and formatting to satisfy checkstyle