Refactore and update readme