Added pointers initialization
Minor tweaks; name changes