Refactoting + README