Clean up some syntax etc