reformatted code to more normal java standards