simplify codebase and made some changes to README