I think it's more important right now to focus on implementing the algorithms, than doing "clean-up" and "refactor" work. We'd also need to update our infrastructure to support these new options.