Debugged, refactored and cleaned old code.