Updated formatting to follow checkstyle conventions