- #49 Refactorings, cleanups and documenting