second attempt at fixing java style differences