Modify code to respect java conventions