clean up and syntax update