Made it more readable and reviewing some comments