[[ RefactorSyntax ]] Some minor tweaks
[[ RefactorSyntax ]] Various fixes