First working release. Renaming private functions and parametres.