PR changes, syntax cleanup