Better organization of the code
Minor improvement