Make some parts conform to java coding style