Another attempt at fixing java style differences