style/syntax changes