Making some code a bit more explicit