Small change to the code to make it more simple.