Refactoring and finished README