Made some syntactic changes