Syntax refactoring

Minor changes, but I noticed some little things that needed to change
while I was running a manual syntax refactoring scan