
          Refactored code, removed unused parts, added tests

2602e12