By Blake

The code structure is not modular enough.