Cleanup of syntax