Correct syntax issues - conform to adocs norms