code cleanup
scala version upgrade