Refactory a little bit
Fix formatting in readme