Syntax and best practices fixups