Re-designed and cleaned up the code