change formatting to java convetions