Renamed local variables according to STAR style guidelines
Changes in comments and commented out code only
Remove extra pointer validation check