Reformat code to conform with java conventions