Syntax clean up per Joe's review