Upload 5

Minor PHP shorthand replacements