Coding style fixes, remove a unnecesary call to the GetPid function