scala 2.10 final, some style fixes