Refactor code and create unit tests.

[chadbeaudin]

The code is old and in significant need of refactoring. Furthermore, there are no unit tests.
Unit tests should be written to test the code before and after refactoring.