reanming to conform to java standards (TBC)