Making the code a bit clear