Refactoring done, but extra code has not been cleaned up. Still testing the refactor, but looks good so far.