another refactoring, readme also changed