Little code cleaning, I don't like big files with big functions.