Some cleanup, better readme