Style and syntax update