scala style fixes