Fix pointer conventions
Stylistic changes to the declarations of variables