Moar rejig!
Fix syntax issues