Remove syntax issues