slick refactoring