Few syntactic changes made for convention