Reformat to java coding standards