Update code to follow java standards