java style fixes