Update readme & refactoring