Making the code more readable