- Some work on #49 Refactorings, cleanups and documenting