Small changes inorder to make the code more predictable.