as
Cleaned up code, commenting. Refined test file.