Refactor and work on readme