Fix syntax issues and comments