Making the code consistent