Stuff changed to enhance the readability of the code