refractoring express-swim