Myg000 12

Adding some minor changes to pass the checkstyle