Code cleaning
Static all the functions