Revert "improve source readability, update readme"

This reverts commit c48278c39622aeb7710127d7b81ef68466f192ff.