Refactor: scala 2.10 compatibility