Updated Java codestyle