reorder imports and rename r -> redisdb