Cleanup to datastores - use for comprehensions, better Slick syntax and type-handling