Refactor Flume