Convert local to my
Remove use of $_
Formal parameter conversion
Added formal parameters to functions
Merge remote-tracking branch 'upstream/master'