Refactored a bit todo from readme