Trying to make code more legible