Removed p<name> for parameters
Ran all code through UncrustifyX